Fix merge nathan