Removed IML file, keeps causing merge conflicts