fixed some head conflicts