fixing merge problems