Fixing merge changes