silly conflict mistake