Fixing merging issues after rebase