Important graphic updates!
Dealing with a merge conflict