Added simple test for emit resolve conflict
WhateverMerge branch 'master' of https://github.com/keithkade/Fantegio