I've already done this in another branch, should I do it here too? There will be conflicts.