Updated the readme on how to deal with the merge back to master