fix code, git merge artifacts