Get branch ready to merge with master