Updated first post.
Solve merge conflict.