would recommend rebasing and fixing the merge conflicts so the diff is easier to follow