Switch to master before merge