Fixed Merging bug