fixing merge problems but not all