add field labels
fix merge conflicts