position character
Add bieber
resolve conflict
add bieber.png