merge conflict fix with tims stuff