Fixed Merge errors