fixes errors
resolves conflicts