update fixtures
conflicts App layout