remove debug
strange merge
forgotten files