Merge problems fixed