C:/Program Files (x86)/Git/MD-/MT conflict resolved and project structure changed