conflict fixed
cleaned project
rm tree exe