Merging in changes before I can work