Second attempt at fixing merge conflict