Resolved conflicts by Stefan