updated path to meta data
resolve conflicts