cleaned more merge stuff up