fixed compilation errors
merge conflict resolved