Commit conflict resolved