minor local changes
fix merge conflict