Fixed remaining git conflicts