merged files and resolved conflicts

what is this? its not even spelled correctly