Removing merge conflicts markers form some files
Fix Gruntfile, merge with upstream - some merge markers, again...