added change lost with merging