fix: #28 Bug in the conflict modal
Share the web code with conflict controller and the notes controller through a service