resolved conflicts and cleaned tests