recovered some changes lost in merge