It'll be heart breaking to have them fight. Both their points are valid. I know mama Shiori will want them to go back to being secret lovers tho 

Buuut for now, things are happy and nice. Fluff~~~