resolving more merge stuff