Solve conflicts

- fixed conflict caused by layout changes