Fix tests/elevator_test: remove merge conflicts markers