Update branch and fix conflicts