add dev
ADD DEV
conflict fixed
signed with gpg
test push