Master conflicting commit