Working with SmartGit to resolve conflict issue as described in MIU videos