fixing bad commit with merge issues