Fixed Merge errers