fixed simple cov error
fixed merge error