merge simple master to fusiondirectory