Resolve silly conflict