bug fix in metadata path
resolve conflicts