removed content that was added by previous merge conflict