remove conflicts
something fixed