initial trip crud
conflicts resolved