Done with part 2.
Fix merge conflict.