fixes to merge conflicts