Fixed Merging errors