Added two boring funcs
conflict resolve