add license
fix conflicts