update package control config file
Fix mergeconflict
pr15
issue #17