solved all conflicts