wired up details view
using transactions
Threeway merge
better handling of merge conflicts
storing latest used store ref
upgraded gradle. lazy dev is lazy. actually doing the ignores would take less time than writing this comment.. oh well :)