solved all the conflicts