fixes merge code accidentally committed