Resolves Conflicts

All of tabs is replaced by spacebars