Fixed meta files conflicts;
Added ruby conflict finder script to root.