work on merge conflicts