Commit of files
Fixing merge conflicts from pull