before changes in merge