(/=) Merge conflicts solved