composer bugfix

tests fixed
resolve conflicts before merge