(Fix) Merge conflicts