cleanup
prepare merge
resolve merge (I hope)