forum v1 merged conflicts