Merging conflict error removed and non_html root files deleted