Delted files left over from merge conflict