Resolve master diff