added gem thin
solved conflicts