Merge common. Fix conflict.