Fix Merge issues