fixed ignore conflict
clean up and catch up
rm garbage
fixed profile location