clean up former merge issues