Resolve merging issue