just some dumb meta data
dealing with merge conflicts
resolved some merging issues