Add placeholders for new work.
Fix merge conflict.