cleaned up merge errors