Adding back conditional for empty path
Resolving conflicts