Converted to Folders instead of single File. Deleted the conflict.

Signed-off-by: firebellys <firebelly@gmail.com>