merged files and resolved conflicts

add this back in