first commit
fixed merge problem