resolving some uncommitted changes