old_contents: __title__ = "eemeter"
  __description__ = "Open Energy Efficiency Meter"
  __url__ = "http://github.com/openeemeter/eemeter"
  <<<<<<< HEAD
  __version__ = "2.1.4"
  =======
  __version__ = "2.1.3"
  >>>>>>> 24f2ecbc763a1aa1c73b4829882a2ca4e3429707
  __author__ = "Phil Ngo"
  __author_email__ = "admin@openee.io"
  __license__ = "Apache 2.0"
  __copyright__ = "Copyright 2017-2018 Open Energy Efficiency, Inc."
  
new_contents: __title__ = "eemeter"
  __description__ = "Open Energy Efficiency Meter"
  __url__ = "http://github.com/openeemeter/eemeter"
  __version__ = "2.1.4"
  __author__ = "Phil Ngo"
  __author_email__ = "admin@openee.io"
  __license__ = "Apache 2.0"
  __copyright__ = "Copyright 2017-2018 Open Energy Efficiency, Inc."
  
subject: Fix conflicts