Merge conflict resolution; double check me