fixing specs
Resolving conflicts