fixing a few conflicts