Gets it ready for merge