Pull request shows conflict when there is none.

[fuck atlassian]

Ok so i manually solved ALL conflicts and the file list shows that there are no conflicts.

as you can see here http://prntscr.com/8j3j14

but the button merge shows there is a conflict, but in reality there is none. There just isnt, everything should just work, but doesnt.

[rrudnicki]

Hi Alex, 

I believe this will requires a further investigation and gathering more information as well.  Do you mind to raise a ticket to us so we can investigate this issue?

Regards

Renato Rudnicki