Merge problems
Fidex some merge issues