commit 9 in temp
fixed merge