Resolved conflict
Resolving conflicts
Added User Interface State file