fix errors after merging