fix image responsive bug
resolve conflicts