removed the bloody mess of the merge commit... :-(