add a new dir & txt file
fix conflicts