going badck to master and setting merge message