Hopefully merge conflict fixes