resolve conflicts
add GitHub repo as plugin homepage