manual merge after comparing with master