delete merge conflict files in layout views folder
merge