rickard
fixed mergE