Contatct module added
conflicts resolved