Updates to prevent merge conflict