Estimates are first and foremost for project planning. Eventually, as various team members get familiar with the codebase, disparities should fade away.
Let's weigh the pros and cons of two popular branch synchronization strategies, Git merge or rebase, and help inform your decision to use one or the other.