executing plan A
fixing merge conflicts