rm --cached AtHere/project.properties because of Confliction