Fixed code errors
updated merge pr