a little fix
did I merge correctly