adding smg
fixing conflict
fixing conflict on branch
Making conflict fix
subtree merged