Fixing issues with merge