Trying again, should be able to merge now