adding proposal directory
some conflicts