resolving conflicts, removing generated files