added then removed show method
fixed merged files