little commit
fixes merge conflicts. those merges some damn counseling