edit some shit
resolve merge conflicts