worked on JnRPlayer
fixed merge problems