resolving merge conflict with coverage