first commit
handle conflicts