Resolved merge conflict on Info.plist. Why ever that happended

Merge branch 'feature-remap' of https://github.com/noah-nuebling/mac-mouse-fix into feature-remap