fixing conflict with proj file

weird conflict!