Try using the newest (as of this moment) version 1567, since there have been some crucial conflict resolution bugfixes in 1561 and 1567.