Fixed conflicts with recent commits