merge the conflick of the infoActivity