Decide tab changes
Resolve merge
Resolve merge