A novel diffuse interface method for two-phase flows and application in simulation of micro-bubble entrainment