fixed figures
merge