remove merge conflict stuff
chain events