merge util
merged conflicts, data grabbing