I'm working on an application and managing its repo on bitbucket.
During the development process, I created a new branch 'price-module' a few days ago and pushed its changes in the remote branch by the same name. Now, when I'm merging 'price-module' to 'development' branch, bitbucket is showing me an error that there are conflicts between these files. (specifically in bin/R.txt). How can I resolve these conflicts and merge the changes I did in 'price-module' to 'development' branch without losing my code?
PS: the project I'm working on is an Android project.
