fixing merge conflict issue by  removing old code