Update My SubModule
Resolve conflict files