Fixing conflicts from rebase operation