updating from repo and merging conflicts