fix conflictions