removing confilct assembly