resolved conflicts from rebase