added player
fixed merge render engine