updated folder icon
resolve conflict