Merge with Master, Master!