first commit
conflicts resolve