Active Store Display
git conflict resolution