remove duplicated method on merge
remove duplicated method on merge

pierredup/gush,sstok/gush,gushphp/gush,gushphp/gush,cordoval/gush,pierredup/gush,webflo/gush,cordoval/gush,gushphp/gush,cordoval/gush,sstok/gush,gushphp/gush,webflo/gush,pierredup/gush,sstok/gush,webflo/gush