yet another commit

fixed conflicts during sync