location partial
fix merge conflicts