[RM] cleaning up merge conflict