merge change && add Gallery