Conflict test

@bodnerdan