Forgot to edit file when merging 

removed conflicts from merging that were forgotten before committing previous commit