fixed spec
resolved conflict