fix all conflicts