nicer
fixed merge