add root
applying log policy
fixing conflict