removed all conflicts