Rebased and resolved