copy: master
added copy "branch three"
commit with conflict