Fix #13
-Failed Conflict resolution fixed.