cleaning up merge issues