remove logs
resole conflicts