fixes merge conflicts left lying around