Manually fix merge conflict