fixed the mergeshit