fixing .idea project conflict (again)