chore: merge task-05 with conflict resolution