merge/rebase mess.
will try to rebase.
thanks for spotting this...