Merge problems cleared :)