Fixes unresolved merge conflict