seems like finishing integration with metadata module.
resolve conflicts