fixed trivial conflicts