bitbucket showing conflicts when trying to merge to target branch, though there is no change in target branch. Anyone encountered similar issue?