Fixed Errors after merge