Merge Problems Fixed