Merge complete, finally =)