first commit
fixed merge