removed MergeConflict in BrickAdapter