Resolved Conflict for La Beaute

Don't know why there was a conflict.  I looked at the two sections and they were exactly the same.  I went with the version labelled upstream/master and that must be the right choice since it says I can automatically merge.  Let's hope I don't blow this thing up!

Ramona