First commit
fixed merge