Signature files addedd
conflicts resolved