Move tab title to top, and remove duplicated title
Fix merge conflicts