merged files and resolved conflicts