Improved task wording in levels/conflict

While we usually merge branches into master, more precise wording should be used in this case. After all, this is a learning tool.