Fixed issues in component selection guide merge