ready merge from server
finish merge
finish category template and start modified good template