before pull commit
conflicts resolving