Removed merge changes