I think the conflict will come, not only because of what Neal did in the past, but from the idea Emma has that Rumple has manipulated her enter life. When she realizes that Neal is his son…I don’t think there’s any way she could see that as a coincidence and that will defiantly give her doubts (heck, Neal too) that their love was genuine rather then something Rumple somehow manufactured.