remove fix
resolved conflicts