solved merge conflict #14

Closed mygamelife closed 9 years ago