initial merge, works