trying to rectify issues with merge