conflicts in html files are resolved and files are merged