working on displaying dirty fields on frontend.
resolving conflicts