you are right, conflict not properly solved after merging ejhernandez branch, thanks!