complete merge with .meteor files restored
what a mess