edit a file to be merged on master