Remove useless conflicts file

Signed-off-by: Charles Joly Beauparlant <charles.joly-beauparlant@crchul.ulaval.ca>
Minor Typo fix
Merge remote-tracking branch 'origin/master'