persistence layer merg fix