Actually fixes merge conflict.