fixing mad merge