Add spec file
Fix merge conflicts