remove conflict on my file