Manually merged changes from my personal branch with the current version of master branch. Git could not resolve conflicts autonomously.