Figuring out merging
Resolve conflict