Merge conflict in src/PowerManager.h

[shirishag75]

Hi Ryan,
Good to see you starting again. I tried today and was not able to get it merged. Hence I removed and started from scratch and was trying the way but still get a merge conflict. Can you look at it :-

 ~/games$ git clone https://github.com/RyanDansie/flare-engine/ ryan-flare-engine
 Cloning into 'ryan-flare-engine'...
 remote: Counting objects: 18700, done.
 remote: Compressing objects: 100% (8269/8269), done.
 remote: Total 18700 (delta 13334), reused 15691 (delta 10379)
 Receiving objects: 100% (18700/18700), 7.37 MiB | 6.00 KiB/s, done.
 Resolving deltas: 100% (13334/13334), done.
 Checking connectivity... done

  ~/games/ryan-flare-engine$ git pull origin ng_engine 
  From https://github.com/RyanDansie/flare-engine
   * branch            ng_engine  -> FETCH_HEAD
  Auto-merging src/PowerManager.h
  CONFLICT (content): Merge conflict in src/PowerManager.h
   Automatic merge failed; fix conflicts and then commit the result.

Maybe I'm doing something wrong. Can you see and tell what am I doing wrong ?

Thinking perhaps it's an issue from my side, I also tried git status and this is what it said :-

  ~/games/ryan-flare-engine$ git status
   # On branch master
   # You have unmerged paths.
   #   (fix conflicts and run "git commit")
   #
   # Unmerged paths:
   #   (use "git add <file>..." to mark resolution)
   #
   #    both modified:      src/PowerManager.h
   #
   no changes added to commit (use "git add" and/or "git commit -a")
   /games/ryan-flare-engine$