You should be careful when fixing conflicts when rebasing a branch. You are reverting another PR here