jophwlocks: Fixed merge errors