Issue #45 resolved conflicts at last