Fix for unresolved conflict