small changes
fix conflicts
fix direction