merging in
fix merge conflicts