[WIP] Resolve merge conflicts