Resolved edit conflict.