Fixed Merging Errors