first try of manual merge