Errors after merge fixed