fuck reverting and conflict solving