Fix the branch conflict