removed leftovers from merge conflicts and recompiled all test css