progress & conflicts in repo killin' aaaaaaaa