Commit conflict resolved manually