first commit to master
resolve conflicts