highlighting conflicts between marked and github