#44 remove merge conflict