fixing merge problems #1