Fixed file lost in merge