first merge

test merge, added proposals