fixed layout issues that happened after the auto-merge