resolving another merge conflict