finish tag test spec and ensure the associations work
clean up spec code
resolve merge conflicts