fix conflicts
minor fix