Resolves conflicts to fix #19