fixed: errors created by merge conflict solution