Force master merge