fixed bug caused by merge, + missing files