checking that everything works after merge