remove unused parts, add scenario, check visible state
resolve conflict