first commit
fixed merge conflict