Fixed Rebase Conflicts