handling empty files
merge conflict