Conflict Fix :P

I had some free time and resolved the conflict for you, still you need to test the functionality :(