initial revision
commit merge conflict resolution