Our development team during performing auto-merge of two streams python files (.py) are causing conflicts even though there is no conflict between the files. Later the conflict is resolved when we select the file and click on auto-resolve. This is causing for all python files and the automerges are keep failing because of this issue. Please let me know is this an expected behavior or is there a way to overcome this issue. Please let me know in case of any information.

Thanks,

Vinay