getting rid of arrows from merge conflict

HELP