Working on Conflict page
fixing merge conflicts