add gems make add notes to files
resolve merge conflicts