Merging conflicts were not totaly resolved