newly added command to git
trying to remove conflict