resolve conflicts
drwxr-xr-x - doc