Resolved conflict and extra grid layout.