removed lingering MERGE issues in stackModel