fixing issues that came with merge