added move resolution phase logic