Commit of all changes to date
fixed merge conflicts