Related ContentReadyApi : avoid Git conflictHow to resolve merge conflicts in ReadyAPIScript Extensions - Plug in name Conflict