fixing errors at merge