finished merging fleuryc