fix merge issue: camelcasing variable names merge mistake in force layout