Resolve master merge conflicts.