first altered from local repository
conflist first resolve