after resolving conflicts fix errors