fixed stage merge conflict