Fixes merge conflict.