small changes
after conflict