Cleanup after conflict

Missed two conflicts.. am I blind? :/