style cop fix
merge issues