Dont remember what I did there... damn
resolving conflicts