Removing stray git confict marker.
Adding edit() task
Adding dir() task