Sam raet 12 Fixed conflict with Tom