Merge bugs resolved