MOB-246 merge undo
Merge pull request #157 from Maryami/MOB-246

MOB-246 merge undo