Hello. How to merge Pull Request if there is conflict and I can not pull conflicts to my local machine? After pull request command I get next message: 'Already up to date'.
