comment out info button
resolved conflicts