you inserted into correct place in global line up and coloured correctly
merge resolved
push merge conflict